From 9c7a5f5efafaa01ccc57a82cc4619f433cbda699 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 26 Nov 2014 18:10:29 -0800 Subject: [PATCH] gtkstylecontext: Optimize GtkStyleContext usage --- gtk/gtkstylecontext.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 3745804f0d..8205ec807e 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -3255,14 +3255,18 @@ G_GNUC_END_IGNORE_DEPRECATIONS } else { - gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, color); + GtkStateFlags state; + + state = gtk_style_context_get_state (context); + + gtk_style_context_get_color (context, state, color); if (!primary) { GdkRGBA bg; G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg); + gtk_style_context_get_background_color (context, state, &bg); G_GNUC_END_IGNORE_DEPRECATIONS color->red = (color->red + bg.red) * 0.5; -- 2.30.2